Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Apr 2010 22:41:29 +0000 (22:41 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Apr 2010 22:41:29 +0000 (22:41 +0000)

Trivial merge